<<<<<<< TREE

<!DOCTYPE  html>
<html>
	<head>
		<meta charset="utf-8">
		<title>Denver Rogalla</title>
		
		<!-- CSS -->
		<link rel="stylesheet" href="css/style.css" type="text/css" media="screen" />
		<link rel="stylesheet" href="css/social-icons.css" type="text/css" media="screen" />
		<!-- ENDS CSS -->	
		
		<!-- test to see changes in repository -->
		<!-- ENDS JS -->
		
		<!-- JS -->
		<script type="text/javascript" src="js/jquery.min.js"></script>
		<script type="text/javascript" src="js/custom.js"></script>
		<script type="text/javascript" src="js/slider.js"></script>
		<script src="js/slides/source/slides.min.jquery.js"></script>
		<script src="js/quicksand.js"></script>
		
		<!-- superfish -->
		<link rel="stylesheet" media="screen" href="css/superfish.css" /> 
		<script type="text/javascript" src="js/superfish-1.4.8/js/hoverIntent.js"></script>
		<script type="text/javascript" src="js/superfish-1.4.8/js/superfish.js"></script>
		<script type="text/javascript" src="js/superfish-1.4.8/js/supersubs.js"></script>
		<!-- ENDS superfish -->

		<!-- poshytip -->
		<link rel="stylesheet" href="js/poshytip-1.0/src/tip-twitter/tip-twitter.css" type="text/css" />
		<link rel="stylesheet" href="js/poshytip-1.0/src/tip-yellowsimple/tip-yellowsimple.css" type="text/css" />
		<script type="text/javascript" src="js/poshytip-1.0/src/jquery.poshytip.min.js"></script>
		<!-- ENDS poshytip -->
		
		
		
		<!-- prettyPhoto -->
		<script type="text/javascript" src="js/prettyPhoto/js/jquery.prettyPhoto.js"></script>
		<link rel="stylesheet" href="js/prettyPhoto/css/prettyPhoto.css" type="text/css" media="screen" />
		<!-- ENDS prettyPhoto -->
		
		<!-- GOOGLE FONTS -->
		<link href='http://fonts.googleapis.com/css?family=Droid+Serif:400italic' rel='stylesheet' type='text/css'>
		

	</head>
	<body>
	
		<!-- Dynamic Background -->
		<div id="headerimgs">
			<div id="headerimg1" class="headerimg"></div>
			<div id="headerimg2" class="headerimg"></div>
		</div>
		<!-- ENDS Dynamic Background -->
		
		<!-- background nav -->
		<div id="headernav">
			<div id="back" class="btn"></div>
			<div id="next" class="btn"></div>
		</div>
		<!-- ENDS background nav -->
		
		<div id="top-gap"></div>

		<!-- wrapper -->
		<div class="wrapper">
		
			<a href="index.html"><img  id="logo" src="img/logo2.png" alt="Rogalla"></a>
			
			
			<!-- nav bar holder -->
			<div id="nav-bar-holder">
				<!-- Navigation -->
				<ul id="nav" class="sf-menu">
					<li class="current-menu-item"><a href="index.html">Home</a></li>
					<li><a href="gallery.html">Portfolio</a></li>
					<li><a href="page.html">Services</a>
						<ul>
							<li><a href="page.html">Web Design</a></li>
							<li><a href="#">Pricing</a></li>
						</ul>
					</li>
					<li><a href="portfolio.html">About</a></li>
					<li><a href="contact.html">Contact</a></li>
					
				</ul>
				<!-- ENDS Navigation -->
				
				<!-- Social -->
				<ul class="social">
					<li><a href="https://www.facebook.com/denver.rogalla" class="poshytip  facebook" title="Become a fan"></a></li>
					<li><a href="http://www.twitter.com" class="poshytip  twitter" title="Follow my tweets"></a></li>
					
				</ul>
				<!-- ENDS Social -->
			</div>
			<!-- ENDS nav bar holder -->
				
			<!-- content wrap -->	    	
	        <div id="content-wrap">
	        	
	        	<!-- Page wrap -->
	        	<div id="page-wrap">
	        	
	        		
	        		<!-- Front slider -->
	        		<div id="front-slides">
						<div class="slides_container">
							<div class="slide">
								<a href="/" target="blank"><img src="img/dummies/treasures.jpg"  alt="pic" width="940" height="360"  /></a>
								
							</div>
							<div class="slide">
								<a href="/" target="blank"><img src="img/dummies/top.jpg" alt="pic" width="940" height="360"  /></a>
								
							</div>
							<div class="slide">
								<img src="img/dummies/940x370.jpg" alt="pic" width="940" height="360"  />
								<!--<div class="caption">Random Filler</div>-->
							</div>
						</div>
						
						<div id="front-slides-cover"></div>
							
						<!-- Headline -->
						<div id="headline"><h6></h6></div>
						<!-- ENDS Headline -->	
					
					</div>
					<!-- ENDS Front slider -->
					
					
					<!-- Reel slider -->
	        		<div id="reel">
						<div class="slides_container">
							
							<div class="slide-box">
								<div class="box-container">
									<img src="img/mono-icons/bargraph32.png" class="box-icon" alt="pic"/>
									<h6>My Work</h6>
									<div class="box-divider"></div>I enjoy doing one thing.  Creating eloquent websites.  Ok so that's not the only thing I enjoy, but I do have a deep passion for web design.  Please browse my site and check out my work!
								</div>
								<div class="box-container">
									<img src="img/mono-icons/boxupload32.png" class="box-icon" alt="pic"/>
									<h6>Updates</h6>
									<div class="box-divider"></div>I will add pertinent updates here.  Stay tuned!
								</div>
								<div class="box-container">
									<img src="img/mono-icons/article32.png" class="box-icon" alt="pic"/>
									<h6>Features</h6>
									<div class="box-divider"></div>My site currently utilizes aspects from the latest HTML5 and CSS3.
								</div>
							</div>
							
							<div class="slide-box">
								<div class="box-container">
									<img src="img/mono-icons/circleright32.png" class="box-icon" alt="pic"/>
									<h6>News</h6>
									<div class="box-divider"></div>News list.
								</div>
								<div class="box-container">
									<img src="img/mono-icons/exchange32.png" class="box-icon" alt="pic"/>
									<h6>Events</h6>
									<div class="box-divider"></div>Events posted here.
								</div>
								<div class="box-container">
									<img src="img/mono-icons/cup32.png" class="box-icon" alt="pic"/>
									<h6>Daily</h6>
									<div class="box-divider"></div>Random?
								</div>
							</div>
							
							
							
						</div>
						<a href="#" class="prev"></a>
						<a href="#" class="next"></a>
					</div>
					<!-- ENDS Reel slider -->
					
					
					
					<!-- Featured -->
					<div class="featured-title">
						<div class="ribbon"><span>Featured content</span></div>
					</div>
					
					
					<p></p>
					
					<div id="bodysize"><p>Hello everyone, and welcome!</p>
					<p>So, you want a website? You are in the right place.  I combine </p><p>intelligible design and guaranteed best prices to provide</p><p> the finest solutions. I utilize the latest in web design technology to </p><p>help you meet your website goals. Head to the About tab above to learn </p><p>more about me or the Contact tab if you have any questions or an </p><p>inquiry!</p></div>
					<div class="clear"></div>
					<!-- ENDS Featured -->
					
	        	
	        	</div>
	        	<!-- ENDS Page wrap -->
	        	
	        </div>
	        <!-- ENDS content wrap -->
	        
        </div>
		<!-- ENDS Wrapper -->
		
		<!-- FOOTER -->
		<div id="footer">
			<div class="footer-wrapper">
				
				
				<!-- footer-cols -->
				<ul id="footer-cols">
					<li>
						<h6>About the theme</h6>
						<p>For this theme, I wanted to aim for a sleek and professional look.  However, I also wanted to implement a fun and artistic side to the website as well.</p>
					</li>
					<li>
						<h6>Help Categoriess</h6>
						<ul>
							<li><a href="http://www.w3schools.com/">Quick Web Design Help</a></li>
							<li><a href="http://validator.w3.org/">HTML Validator</a></li>
							<li><a href="http://www.gimp.org/">GIMP Photo Editor</a></li>
							
						</ul>
					</li>
					<li>
						
						<h6>Comments</h6>
						<p>Go to the Contact tab to leave any comments!</p>
					</li>
				</ul>
				<!-- ENDS footer-cols -->
				
				<div id="footer-glare"></div>
				
			</div>
		</div>
		<!-- ENDS FOOTER -->
		
		<!-- footer-bottom -->
		<div id="footer-bottom">
			<div class="bottom-wrapper">
				<div id="bottom-left">
					&copy; 2012 Rogalla Design.  <a href="/">View portfolio</a>
				</div>
				<div id="bottom-right">
					<ul id="footer-nav">
						<li><a href="index.html">Home</a></li>
						<li><a href="gallery.html">Gallery</a></li>
						<li><a href="page.html">Pages</a>
						<li><a href="page.html">Contact</a>
					</ul>
				</div>
			</div>
		</div>
		<!-- ENDS footer-bottom -->


		
	</body>
=======
<!DOCTYPE  html>
<html>
	<head>
		<meta charset="utf-8">
		<title>Denver Rogalla</title>
		
		<!-- CSS -->
		<link rel="stylesheet" href="css/style.css" type="text/css" media="screen" />
		<link rel="stylesheet" href="css/social-icons.css" type="text/css" media="screen" />
		<!-- ENDS CSS -->	
		<!-- update test-->	
		
		<!-- ENDS JS -->
		
		<!-- JS -->
		<script type="text/javascript" src="js/jquery.min.js"></script>
		<script type="text/javascript" src="js/custom.js"></script>
		<script type="text/javascript" src="js/slider.js"></script>
		<script src="js/slides/source/slides.min.jquery.js"></script>
		<script src="js/quicksand.js"></script>
		
		<!-- superfish -->
		<link rel="stylesheet" media="screen" href="css/superfish.css" /> 
		<script type="text/javascript" src="js/superfish-1.4.8/js/hoverIntent.js"></script>
		<script type="text/javascript" src="js/superfish-1.4.8/js/superfish.js"></script>
		<script type="text/javascript" src="js/superfish-1.4.8/js/supersubs.js"></script>
		<!-- ENDS superfish -->

		<!-- poshytip -->
		<link rel="stylesheet" href="js/poshytip-1.0/src/tip-twitter/tip-twitter.css" type="text/css" />
		<link rel="stylesheet" href="js/poshytip-1.0/src/tip-yellowsimple/tip-yellowsimple.css" type="text/css" />
		<script type="text/javascript" src="js/poshytip-1.0/src/jquery.poshytip.min.js"></script>
		<!-- ENDS poshytip -->
		
		
		
		<!-- prettyPhoto -->
		<script type="text/javascript" src="js/prettyPhoto/js/jquery.prettyPhoto.js"></script>
		<link rel="stylesheet" href="js/prettyPhoto/css/prettyPhoto.css" type="text/css" media="screen" />
		<!-- ENDS prettyPhoto -->
		
		<!-- GOOGLE FONTS -->
		<link href='http://fonts.googleapis.com/css?family=Droid+Serif:400italic' rel='stylesheet' type='text/css'>
		

	</head>
	<body>
	
		<!-- Dynamic Background -->
		<div id="headerimgs">
			<div id="headerimg1" class="headerimg"></div>
			<div id="headerimg2" class="headerimg"></div>
		</div>
		<!-- ENDS Dynamic Background -->
		
		<!-- background nav -->
		<div id="headernav">
			<div id="back" class="btn"></div>
			<div id="next" class="btn"></div>
		</div>
		<!-- ENDS background nav -->
		
		<div id="top-gap"></div>

		<!-- wrapper -->
		<div class="wrapper">
		
			<a href="index.html"><img  id="logo" src="img/logo2.png" alt="Rogalla"></a>
			
			
			<!-- nav bar holder -->
			<div id="nav-bar-holder">
				<!-- Navigation -->
				<ul id="nav" class="sf-menu">
					<li class="current-menu-item"><a href="index.html">Home</a></li>
					<li><a href="gallery.html">Portfolio</a></li>
					<li><a href="page.html">Services</a>
						<ul>
							<li><a href="page.html">Web Design</a></li>
							<li><a href="#">Pricing</a></li>
						</ul>
					</li>
					<li><a href="portfolio.html">About</a></li>
					<li><a href="contact.html">Contact</a></li>
					
				</ul>
				<!-- ENDS Navigation -->
				
				<!-- Social -->
				<ul class="social">
					<li><a href="https://www.facebook.com/denver.rogalla" class="poshytip  facebook" title="Become a fan"></a></li>
					<li><a href="http://www.twitter.com" class="poshytip  twitter" title="Follow my tweets"></a></li>
					
				</ul>
				<!-- ENDS Social -->
			</div>
			<!-- ENDS nav bar holder -->
				
			<!-- content wrap -->	    	
	        <div id="content-wrap">
	        	
	        	<!-- Page wrap -->
	        	<div id="page-wrap">
	        	
	        		
	        		<!-- Front slider -->
	        		<div id="front-slides">
						<div class="slides_container">
							<div class="slide">
								<a href="/" target="blank"><img src="img/dummies/treasures.jpg"  alt="pic" width="940" height="360"  /></a>
								
							</div>
							<div class="slide">
								<a href="/" target="blank"><img src="img/dummies/top.jpg" alt="pic" width="940" height="360"  /></a>
								
							</div>
							<div class="slide">
								<img src="img/dummies/940x370.jpg" alt="pic" width="940" height="360"  />
								<!--<div class="caption">Random Filler</div>-->
							</div>
						</div>
						
						<div id="front-slides-cover"></div>
							
						<!-- Headline -->
						<div id="headline"><h6></h6></div>
						<!-- ENDS Headline -->	
					
					</div>
					<!-- ENDS Front slider -->
					
					
					<!-- Reel slider -->
	        		<div id="reel">
						<div class="slides_container">
							
							<div class="slide-box">
								<div class="box-container">
									<img src="img/mono-icons/bargraph32.png" class="box-icon" alt="pic"/>
									<h6>My Work</h6>
									<div class="box-divider"></div>I enjoy doing one thing.  Creating eloquent websites.  Ok so that's not the only thing I enjoy, but I do have a deep passion for web design.  Please browse my site and check out my work!
								</div>
								<div class="box-container">
									<img src="img/mono-icons/boxupload32.png" class="box-icon" alt="pic"/>
									<h6>Updates</h6>
									<div class="box-divider"></div>I will add pertinent updates here.  Stay tuned!
								</div>
								<div class="box-container">
									<img src="img/mono-icons/article32.png" class="box-icon" alt="pic"/>
									<h6>Features</h6>
									<div class="box-divider"></div>My site currently utilizes aspects from the latest HTML5 and CSS3.
								</div>
							</div>
							
							<div class="slide-box">
								<div class="box-container">
									<img src="img/mono-icons/circleright32.png" class="box-icon" alt="pic"/>
									<h6>News</h6>
									<div class="box-divider"></div>News list.
								</div>
								<div class="box-container">
									<img src="img/mono-icons/exchange32.png" class="box-icon" alt="pic"/>
									<h6>Events</h6>
									<div class="box-divider"></div>Events posted here.
								</div>
								<div class="box-container">
									<img src="img/mono-icons/cup32.png" class="box-icon" alt="pic"/>
									<h6>Daily</h6>
									<div class="box-divider"></div>Random?
								</div>
							</div>
							
							
							
						</div>
						<a href="#" class="prev"></a>
						<a href="#" class="next"></a>
					</div>
					<!-- ENDS Reel slider -->
					
					
					
					<!-- Featured -->
					<div class="featured-title">
						<div class="ribbon"><span>Featured content</span></div>
					</div>
					
					
					<p></p>
					
					<div id="bodysize"><p>Hello everyone, and welcome!</p>
					<p>So, you want a website? You are in the right place.  I combine </p><p>intelligible design and guaranteed best prices to provide</p><p> the finest solutions. I utilize the latest in web design technology to </p><p>help you meet your website goals. Head to the About tab above to learn </p><p>more about me or the Contact tab if you have any questions or an </p><p>inquiry!</p></div>
					<div class="clear"></div>
					<!-- ENDS Featured -->
					
	        	
	        	</div>
	        	<!-- ENDS Page wrap -->
	        	
	        </div>
	        <!-- ENDS content wrap -->
	        
        </div>
		<!-- ENDS Wrapper -->
		
		<!-- FOOTER -->
		<div id="footer">
			<div class="footer-wrapper">
				
				
				<!-- footer-cols -->
				<ul id="footer-cols">
					<li>
						<h6>About the theme</h6>
						<p>For this theme, I wanted to aim for a sleek and professional look.  However, I also wanted to implement a fun and artistic side to the website as well.</p>
					</li>
					<li>
						<h6>Help Categoriess</h6>
						<ul>
							<li><a href="http://www.w3schools.com/">Quick Web Design Help</a></li>
							<li><a href="http://validator.w3.org/">HTML Validator</a></li>
							<li><a href="http://www.gimp.org/">GIMP Photo Editor</a></li>
							
						</ul>
					</li>
					<li>
						
						<h6>Comments</h6>
						<p>Go to the Contact tab to leave any comments!</p>
					</li>
				</ul>
				<!-- ENDS footer-cols -->
				
				<div id="footer-glare"></div>
				
			</div>
		</div>
		<!-- ENDS FOOTER -->
		
		<!-- footer-bottom -->
		<div id="footer-bottom">
			<div class="bottom-wrapper">
				<div id="bottom-left">
					&copy; 2012 Rogalla Design.  <a href="/">View portfolio</a>
				</div>
				<div id="bottom-right">
					<ul id="footer-nav">
						<li><a href="index.html">Home</a></li>
						<li><a href="gallery.html">Gallery</a></li>
						<li><a href="page.html">Pages</a>
						<li><a href="page.html">Contact</a>
					</ul>
				</div>
			</div>
		</div>
		<!-- ENDS footer-bottom -->


		
	</body>
>>>>>>> MERGE-SOURCE
</html>